Auto merge of #1988 - alexcrichton:bump, r=brson
authorbors <bors@rust-lang.org>
Wed, 16 Sep 2015 17:34:50 +0000 (17:34 +0000)
committerbors <bors@rust-lang.org>
Wed, 16 Sep 2015 17:34:50 +0000 (17:34 +0000)
I'll tag 0.5.0 with the previous commit after this is merged.


Trivial merge